auto merge of #402 : alexcrichton/cargo/import-rename, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 19 Aug 2014 05:02:35 +0000 (05:02 +0000)
committerbors <bors@rust-lang.org>
Tue, 19 Aug 2014 05:02:35 +0000 (05:02 +0000)

Trivial merge